Skip to content

Conversation

onur-ozkan
Copy link
Contributor

See #131296 (comment).

Reverts #130121 and #129584.

Fixes #131296 and #131324.

…old-upstream-worktree, r=albertlarsan68"

This reverts commit 507c05b, reversing
changes made to 0609062.
@rustbot
Copy link
Collaborator

rustbot commented Oct 6, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 6, 2024
…warning, r=albertlarsan68"

This reverts commit 776187d, reversing
changes made to 7d01557.
@Kobzol
Copy link
Member

Kobzol commented Oct 7, 2024

I agree that poking into the internals of git manually is not a good idea, unless we want to include libgit2/gix as a dependency (which we probably don't). Not sure if this really fixes #131324, as I could not reproduce it locally even after running git gc.

It should definitely fix #131296 though.

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 7, 2024

📌 Commit 1e5c4cb has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#131331 (Revert "warn_old_master_branch" check)
 - rust-lang#131344 (Avoid `&Lrc<T>` in various places)
 - rust-lang#131346 (Restrict `ignore-mode-*` directives)
 - rust-lang#131353 (Add documentation for `runtest::check_rustdoc_test_option` method)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3a5a816 into rust-lang:master Oct 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
Rollup merge of rust-lang#131331 - onur-ozkan:131296, r=Kobzol

Revert "warn_old_master_branch" check

See rust-lang#131296 (comment).

Reverts rust-lang#130121 and rust-lang#129584.

Fixes rust-lang#131296 and rust-lang#131324.
tgross35 added a commit to tgross35/rust that referenced this pull request Oct 12, 2024
force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment

When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use `git_upstream_merge_base` to correctly track modified files as bors commits may be in `HEAD` but not yet on the upstream remote.

This is also an alternative fix for rust-lang#129528 since rust-lang#131331 reverts the previous fix attempts.
tgross35 added a commit to tgross35/rust that referenced this pull request Oct 13, 2024
force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment

When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use `git_upstream_merge_base` to correctly track modified files as bors commits may be in `HEAD` but not yet on the upstream remote.

This is also an alternative fix for rust-lang#129528 since rust-lang#131331 reverts the previous fix attempts.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2024
Rollup merge of rust-lang#131358 - onur-ozkan:129528, r=Mark-Simulacrum

force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment

When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use `git_upstream_merge_base` to correctly track modified files as bors commits may be in `HEAD` but not yet on the upstream remote.

This is also an alternative fix for rust-lang#129528 since rust-lang#131331 reverts the previous fix attempts.
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Oct 14, 2024
force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment

When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use `git_upstream_merge_base` to correctly track modified files as bors commits may be in `HEAD` but not yet on the upstream remote.

This is also an alternative fix for rust-lang/rust#129528 since rust-lang/rust#131331 reverts the previous fix attempts.
flip1995 pushed a commit to flip1995/rust that referenced this pull request Oct 18, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#131331 (Revert "warn_old_master_branch" check)
 - rust-lang#131344 (Avoid `&Lrc<T>` in various places)
 - rust-lang#131346 (Restrict `ignore-mode-*` directives)
 - rust-lang#131353 (Add documentation for `runtest::check_rustdoc_test_option` method)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bootstrap shows unexpected warning: unable to check if origin/master is old due to error
4 participants